[CRE-491] Used moved FeedID from chainlink-common#22383
Merged
Conversation
product-security-plaid-production
Bot
requested review from
justinkaseman and
kalverra
Contributor
|
👋 pavel-raykov, thanks for creating this pull request! To help reviewers, please consider creating future PRs as drafts first. This allows you to self-review and make any final changes before notifying the team. Once you're ready, you can mark it as "Ready for review" to request feedback. Thanks! |
Contributor
|
I see you updated files related to
|
Contributor
|
✅ No conflicts with other open PRs targeting |
Contributor
There was a problem hiding this comment.
Pull request overview
Risk Rating: LOW–MEDIUM (mechanical type migration + dependency bumps, but touches Mercury/OCR2 wiring paths)
This PR updates Chainlink to use the moved Mercury FeedID/FeedVersion types from chainlink-common (instead of chainlink-data-streams/mercury/utils) and bumps chainlink-common + chainlink-data-streams versions accordingly, keeping Mercury plugin/config/telemetry paths consistent with upstream changes.
Changes:
- Bump
github.com/smartcontractkit/chainlink-commonandgithub.com/smartcontractkit/chainlink-data-streamsversions across root, deployment, scripts, and test modules (plus plugin gitRef). - Migrate Mercury feed identifiers/version constants to
chainlink-common/pkg/types/mercuryin EVM Mercury v2/v3/v4 data sources, provider wiring, OCR2 Mercury plugin, and enhanced telemetry. - Update tests to use the new
FeedIDtype andt.Context().
Scrupulous human review areas:
core/services/ocr2/delegate.go: feedID casting into the Mercury plugin service constructor (ensures the on-chain feedID representation matches the newmercurytypes.FeedIDexpectations).core/services/relay/evm/mercury_provider.go: codec selection byfeedID.Version()(any mismatch in version parsing would route to the wrong report codec).core/services/ocrcommon/telemetry.go+core/services/llo/telem/telemetry.go:FeedVersionpropagation into telemetry parsing (ensures correct parsing logic selection for bridge task telemetry).
Reviewed changes
Copilot reviewed 21 out of 28 changed files in this pull request and generated no comments.
Show a summary per file
| File | Description |
|---|---|
| system-tests/tests/go.mod | Bumps chainlink-common and chainlink-data-streams versions for system test module. |
| system-tests/tests/go.sum | Updates checksums for the bumped dependencies. |
| system-tests/lib/go.mod | Bumps chainlink-common and indirect chainlink-data-streams in system-tests lib module. |
| system-tests/lib/go.sum | Updates checksums for the bumped dependencies. |
| plugins/plugins.public.yaml | Updates Mercury streams plugin gitRef to the new chainlink-data-streams version. |
| integration-tests/load/go.mod | Bumps chainlink-common and indirect chainlink-data-streams for load tests module. |
| integration-tests/load/go.sum | Updates checksums for the bumped dependencies. |
| integration-tests/go.mod | Bumps chainlink-common and indirect chainlink-data-streams for integration tests module. |
| integration-tests/go.sum | Updates checksums for the bumped dependencies. |
| go.mod | Bumps root module chainlink-common and chainlink-data-streams requirements. |
| go.sum | Updates checksums for the bumped dependencies. |
| deployment/go.mod | Bumps chainlink-common and indirect chainlink-data-streams in deployment module. |
| deployment/go.sum | Updates checksums for the bumped dependencies. |
| core/scripts/go.mod | Bumps chainlink-common and chainlink-data-streams in scripts module. |
| core/scripts/go.sum | Updates checksums for the bumped dependencies. |
| core/services/relay/evm/mercury/v2/data_source.go | Replaces mercury/utils FeedID/FeedVersion usage with chainlink-common Mercury types/constants. |
| core/services/relay/evm/mercury/v2/data_source_test.go | Updates tests to use new FeedID type and t.Context(). |
| core/services/relay/evm/mercury/v3/data_source.go | Same migration for Mercury v3 datasource + FeedVersion constant usage. |
| core/services/relay/evm/mercury/v3/data_source_test.go | Updates tests to use new FeedID type and t.Context(). |
| core/services/relay/evm/mercury/v4/data_source.go | Same migration for Mercury v4 datasource + FeedVersion constant usage. |
| core/services/relay/evm/mercury/v4/data_source_test.go | Updates tests to use new FeedID type and t.Context(). |
| core/services/relay/evm/mercury_provider.go | Updates feedID type used for codec selection and report decoding plumbing. |
| core/services/ocrcommon/telemetry.go | Migrates enhanced telemetry structs/functions to chainlink-common Mercury FeedVersion. |
| core/services/ocr2/plugins/mercury/plugin.go | Updates plugin service wiring to accept/use chainlink-common Mercury FeedID. |
| core/services/ocr2/plugins/mercury/plugin_test.go | Updates tests to use chainlink-common Mercury FeedID. |
| core/services/ocr2/plugins/mercury/config/config.go | Updates plugin config schema to use *mercury.FeedID and validation signature accordingly. |
| core/services/ocr2/delegate.go | Updates Mercury service construction to cast to chainlink-common Mercury FeedID. |
| core/services/llo/telem/telemetry.go | Updates legacy Mercury telemetry path to use chainlink-common FeedVersion constant. |
Collaborator
Author
|
.cora |
jmank88
approved these changes
May 11, 2026
justinkaseman
approved these changes
May 11, 2026
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Requires:
Also updated some var names to please the linter.